From f8d6ae67d5e5bc8613ff1d304d43ebcd9a366ec2 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 30 Mar 2007 10:21:17 -0600 Subject: [PATCH] [IA64] Cleanup vcpu *d Signed-off-by: Akio Takebe --- xen/arch/ia64/vmx/vmmu.c | 6 +++--- xen/include/asm-ia64/vmmu.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c index ee456c030e..92eacf52ef 100644 --- a/xen/arch/ia64/vmx/vmmu.c +++ b/xen/arch/ia64/vmx/vmmu.c @@ -212,7 +212,7 @@ void free_domain_tlb(struct vcpu *v) * Insert guest TLB to machine TLB. * data: In TLB format */ -void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb) +void machine_tlb_insert(struct vcpu *v, thash_data_t *tlb) { u64 psr; thash_data_t mtlb; @@ -221,12 +221,12 @@ void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb) mtlb.ifa = tlb->vadr; mtlb.itir = tlb->itir & ~ITIR_RV_MASK; mtlb.page_flags = tlb->page_flags & ~PAGE_FLAGS_RV_MASK; - mtlb.ppn = get_mfn(d->domain,tlb->ppn); + mtlb.ppn = get_mfn(v->domain, tlb->ppn); mtlb_ppn=mtlb.ppn; #if 0 if (mtlb_ppn == INVALID_MFN) - panic_domain(vcpu_regs(d),"Machine tlb insert with invalid mfn number.\n"); + panic_domain(vcpu_regs(v), "Machine tlb insert with invalid mfn number.\n"); #endif psr = ia64_clear_ic(); diff --git a/xen/include/asm-ia64/vmmu.h b/xen/include/asm-ia64/vmmu.h index 84c23c2dfd..bf6889b2cc 100644 --- a/xen/include/asm-ia64/vmmu.h +++ b/xen/include/asm-ia64/vmmu.h @@ -295,9 +295,9 @@ extern int thash_lock_tc(thash_cb_t *hcb, u64 va, u64 size, int rid, char cl, in extern u64 machine_ttag(PTA pta, u64 va); extern u64 machine_thash(PTA pta, u64 va); extern void purge_machine_tc_by_domid(domid_t domid); -extern void machine_tlb_insert(struct vcpu *d, thash_data_t *tlb); +extern void machine_tlb_insert(struct vcpu *v, thash_data_t *tlb); extern ia64_rr vmmu_get_rr(struct vcpu *vcpu, u64 va); -extern int init_domain_tlb(struct vcpu *d); +extern int init_domain_tlb(struct vcpu *v); extern void free_domain_tlb(struct vcpu *v); extern thash_data_t * vsa_thash(PTA vpta, u64 va, u64 vrr, u64 *tag); extern thash_data_t * vhpt_lookup(u64 va); -- 2.30.2